diff options
| author | dujinkim <dujin.kim@dtsolution.co.kr> | 2025-06-17 09:02:32 +0000 |
|---|---|---|
| committer | dujinkim <dujin.kim@dtsolution.co.kr> | 2025-06-17 09:02:32 +0000 |
| commit | 7a1524ba54f43d0f2a19e4bca2c6a2e0b01c5ef1 (patch) | |
| tree | daa214d404c7fc78b32419a028724e5671a6c7a4 /app/[lng] | |
| parent | fa6a6093014c5d60188edfc9c4552e81c4b97bd1 (diff) | |
(대표님) 20250617 18시 작업사항
Diffstat (limited to 'app/[lng]')
| -rw-r--r-- | app/[lng]/evcp/(evcp)/b-rfq/[id]/initial/page.tsx | 13 | ||||
| -rw-r--r-- | app/[lng]/evcp/(evcp)/budgetary-tech-sales-ship/page.tsx | 12 | ||||
| -rw-r--r-- | app/[lng]/partners/(partners)/rfq-answer/[vendorId]/[rfqRecordId]/page.tsx | 174 | ||||
| -rw-r--r-- | app/[lng]/partners/(partners)/rfq-answer/page.tsx | 210 | ||||
| -rw-r--r-- | app/[lng]/partners/(partners)/rfq-ship/[id]/page.tsx (renamed from app/[lng]/partners/(partners)/rfq-all/[id]/page.tsx) | 0 | ||||
| -rw-r--r-- | app/[lng]/partners/(partners)/rfq-ship/page.tsx (renamed from app/[lng]/partners/(partners)/rfq-all/page.tsx) | 0 |
6 files changed, 395 insertions, 14 deletions
diff --git a/app/[lng]/evcp/(evcp)/b-rfq/[id]/initial/page.tsx b/app/[lng]/evcp/(evcp)/b-rfq/[id]/initial/page.tsx index 77ebebb1..1af65fbc 100644 --- a/app/[lng]/evcp/(evcp)/b-rfq/[id]/initial/page.tsx +++ b/app/[lng]/evcp/(evcp)/b-rfq/[id]/initial/page.tsx @@ -27,14 +27,11 @@ export default async function RfqPage(props: IndexPageProps) { const search = searchParamsInitialRfqDetailCache.parse(searchParams) const validFilters = getValidFilters(search.filters) - const promises = Promise.all([ - getInitialRfqDetail({ - ...search, - filters: validFilters, - }, - idAsNumber) - ]) - + const promises = getInitialRfqDetail({ + ...search, + filters: validFilters, + }, idAsNumber) + // 4) 렌더링 return ( <div className="space-y-6"> diff --git a/app/[lng]/evcp/(evcp)/budgetary-tech-sales-ship/page.tsx b/app/[lng]/evcp/(evcp)/budgetary-tech-sales-ship/page.tsx index 05b856e5..b7bf9d15 100644 --- a/app/[lng]/evcp/(evcp)/budgetary-tech-sales-ship/page.tsx +++ b/app/[lng]/evcp/(evcp)/budgetary-tech-sales-ship/page.tsx @@ -1,5 +1,5 @@ -import { searchParamsCache } from "@/lib/techsales-rfq/validations" -import { getTechSalesRfqsWithJoin } from "@/lib/techsales-rfq/service" +import { searchParamsShipCache } from "@/lib/techsales-rfq/validations" +import { getTechSalesShipRfqsWithJoin } from "@/lib/techsales-rfq/service" import { getValidFilters } from "@/lib/data-table" import { Shell } from "@/components/shell" import { DataTableSkeleton } from "@/components/data-table/data-table-skeleton" @@ -15,13 +15,13 @@ export default async function RfqPage(props: RfqPageProps) { // searchParams를 await하여 resolve const searchParams = await props.searchParams - // 파라미터 파싱 - const search = searchParamsCache.parse(searchParams); + // 조선용 파라미터 파싱 + const search = searchParamsShipCache.parse(searchParams); const validFilters = getValidFilters(search.filters); // 기술영업 조선 RFQ 데이터를 Promise.all로 감싸서 전달 const promises = Promise.all([ - getTechSalesRfqsWithJoin({ + getTechSalesShipRfqsWithJoin({ ...search, // 모든 파라미터 전달 (page, perPage, sort, basicFilters, filters 등) filters: validFilters, // 고급 필터를 명시적으로 오버라이드 (파싱된 버전) }) @@ -53,7 +53,7 @@ export default async function RfqPage(props: RfqPageProps) { /> } > - <RFQListTable promises={promises} className="h-full" /> + <RFQListTable promises={promises} className="h-full" rfqType="SHIP" /> </React.Suspense> </div> </Shell> diff --git a/app/[lng]/partners/(partners)/rfq-answer/[vendorId]/[rfqRecordId]/page.tsx b/app/[lng]/partners/(partners)/rfq-answer/[vendorId]/[rfqRecordId]/page.tsx new file mode 100644 index 00000000..898dc41b --- /dev/null +++ b/app/[lng]/partners/(partners)/rfq-answer/[vendorId]/[rfqRecordId]/page.tsx @@ -0,0 +1,174 @@ +// app/vendor/responses/[vendorId]/[rfqRecordId]/[rfqType]/page.tsx +import * as React from "react"; +import Link from "next/link"; +import { Metadata } from "next"; +import { getServerSession } from "next-auth/next"; +import { authOptions } from "@/app/api/auth/[...nextauth]/route"; +import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"; +import { Button } from "@/components/ui/button"; +import { Badge } from "@/components/ui/badge"; +import { Alert, AlertDescription } from "@/components/ui/alert"; +import { Progress } from "@/components/ui/progress"; +import { + ArrowLeft, + FileText, + AlertTriangle, + TrendingUp, + CheckCircle2, + RefreshCw, + GitBranch, + Clock, + FileCheck, + Calendar +} from "lucide-react"; +import { Shell } from "@/components/shell"; +import { formatDate } from "@/lib/utils"; +import { getRfqAttachmentResponsesWithRevisions } from "@/lib/b-rfq/service"; +import { FinalRfqResponseTable } from "@/lib/b-rfq/vendor-response/response-detail-table"; + +export const metadata: Metadata = { + title: "RFQ 응답 상세", + description: "RFQ 첨부파일별 응답 관리 - 고급 리비전 추적", +}; + +interface RfqResponseDetailPageProps { + params: Promise<{ + vendorId: string; + rfqRecordId: string; + }>; +} + +export default async function RfqResponseDetailPage(props: RfqResponseDetailPageProps) { + const params = await props.params; + const { vendorId, rfqRecordId, rfqType } = params; + + // 인증 확인 + const session = await getServerSession(authOptions); + + if (!session || !session.user) { + return ( + <Shell className="gap-6"> + <div className="text-center py-12"> + <p className="text-muted-foreground">로그인이 필요합니다.</p> + </div> + </Shell> + ); + } + + // 벤더 권한 확인 + if (session.user.domain !== "partners" || String(session.user.companyId) !== vendorId) { + return ( + <Shell className="gap-6"> + <div className="text-center py-12"> + <p className="text-muted-foreground">접근 권한이 없습니다.</p> + </div> + </Shell> + ); + } + + // 데이터 조회 (뷰 기반 고급 리비전 정보 포함) + const { data: responses, rfqInfo, vendorInfo, statistics, progressSummary } = + await getRfqAttachmentResponsesWithRevisions(vendorId, rfqRecordId); + + console.log("Enhanced RFQ Data:", { responses, statistics, progressSummary }); + + if (!rfqInfo) { + return ( + <Shell className="gap-6"> + <div className="text-center py-12"> + <p className="text-muted-foreground">RFQ 정보를 찾을 수 없습니다.</p> + </div> + </Shell> + ); + } + + const stats = statistics; + + return ( + <Shell className="gap-6"> + {/* 헤더 */} + <div className="flex items-center justify-between"> + <div className="flex items-center gap-4"> + <Button variant="ghost" size="sm" asChild> + <Link href="/partners/rfq-answer"> + <ArrowLeft className="h-4 w-4 mr-2" /> + 돌아가기 + </Link> + </Button> + <div> + <h2 className="text-2xl font-bold tracking-tight"> + {rfqInfo.rfqCode} - RFQ 응답 관리 + </h2> + <p className="text-muted-foreground"> + 고급 리비전 추적 및 응답 상태 관리 + </p> + </div> + </div> + + {/* 마감일 표시 */} + {progressSummary?.daysToDeadline !== undefined && ( + <div className="text-right"> + <div className="flex items-center gap-2 text-sm text-muted-foreground"> + <Calendar className="h-4 w-4" /> + <span>마감까지</span> + </div> + <div className={`text-lg font-bold ${ + progressSummary.daysToDeadline < 0 + ? 'text-red-600' + : progressSummary.daysToDeadline <= 3 + ? 'text-orange-600' + : 'text-green-600' + }`}> + {progressSummary.daysToDeadline < 0 + ? `${Math.abs(progressSummary.daysToDeadline)}일 초과` + : `${progressSummary.daysToDeadline}일 남음` + } + </div> + </div> + )} + </div> + + {/* 중요 알림들 */} + <div className="space-y-3"> + {stats.versionMismatch > 0 && ( + <Alert className="border-blue-200 bg-blue-50"> + <RefreshCw className="h-4 w-4 text-blue-600" /> + <AlertDescription className="text-blue-800"> + <strong>{stats.versionMismatch}개 항목</strong>에서 발주처의 최신 리비전과 응답 리비전이 일치하지 않습니다. + 최신 버전으로 업데이트를 권장합니다. + </AlertDescription> + </Alert> + )} + + {progressSummary?.daysToDeadline !== undefined && progressSummary.daysToDeadline <= 3 && progressSummary.daysToDeadline >= 0 && ( + <Alert className="border-orange-200 bg-orange-50"> + <Clock className="h-4 w-4 text-orange-600" /> + <AlertDescription className="text-orange-800"> + 마감일이 <strong>{progressSummary.daysToDeadline}일</strong> 남았습니다. + 미응답 항목({stats.pending}개)의 신속한 처리가 필요합니다. + </AlertDescription> + </Alert> + )} + + {progressSummary?.attachmentsWithMultipleRevisions > 0 && ( + <Alert className="border-purple-200 bg-purple-50"> + <GitBranch className="h-4 w-4 text-purple-600" /> + <AlertDescription className="text-purple-800"> + <strong>{progressSummary.attachmentsWithMultipleRevisions}개 첨부파일</strong>에 + 다중 리비전이 있습니다. 히스토리를 확인하여 올바른 버전으로 응답해주세요. + </AlertDescription> + </Alert> + )} + </div> + <FinalRfqResponseTable + data={responses} + statistics={stats} + showHeader={true} + title="첨부파일별 응답 현황" + /> + + + + </Shell> + ); +}
\ No newline at end of file diff --git a/app/[lng]/partners/(partners)/rfq-answer/page.tsx b/app/[lng]/partners/(partners)/rfq-answer/page.tsx new file mode 100644 index 00000000..1869c74e --- /dev/null +++ b/app/[lng]/partners/(partners)/rfq-answer/page.tsx @@ -0,0 +1,210 @@ +// app/vendor/responses/page.tsx +import * as React from "react"; +import Link from "next/link"; +import { Metadata } from "next"; +import { getServerSession } from "next-auth/next"; +import { authOptions } from "@/app/api/auth/[...nextauth]/route"; +import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"; +import { Button } from "@/components/ui/button"; +import { LogIn, FileX, Clock, CheckCircle, AlertTriangle } from "lucide-react"; +import { DataTableSkeleton } from "@/components/data-table/data-table-skeleton"; +import { Shell } from "@/components/shell"; +import { getValidFilters } from "@/lib/data-table"; +import { type SearchParams } from "@/types/table"; +import { searchParamsVendorResponseCache } from "@/lib/b-rfq/validations"; +import { getVendorResponseProgress, getVendorResponseStatusCounts, getVendorRfqResponses } from "@/lib/b-rfq/service"; +import { VendorResponsesTable } from "@/lib/b-rfq/vendor-response/vendor-responses-table"; + +export const metadata: Metadata = { + title: "응답 관리", + description: "RFQ 첨부파일 응답 현황을 관리합니다", +}; + +interface IndexPageProps { + searchParams: Promise<SearchParams> +} + +export default async function IndexPage(props: IndexPageProps) { + const searchParams = await props.searchParams + const search = searchParamsVendorResponseCache.parse(searchParams) + const validFilters = getValidFilters(search.filters) + + // 인증 확인 + const session = await getServerSession(authOptions); + + // 로그인 확인 + if (!session || !session.user) { + return ( + <Shell className="gap-6"> + <div className="flex items-center justify-between"> + <div> + <h2 className="text-2xl font-bold tracking-tight"> + 응답 관리 + </h2> + <p className="text-muted-foreground"> + RFQ 첨부파일 응답 현황을 확인하고 관리합니다. + </p> + </div> + </div> + + <div className="flex flex-col items-center justify-center py-12 text-center"> + <div className="rounded-lg border border-dashed p-10 shadow-sm"> + <h3 className="mb-2 text-xl font-semibold">로그인이 필요합니다</h3> + <p className="mb-6 text-muted-foreground"> + 응답 현황을 확인하려면 먼저 로그인하세요. + </p> + <Button size="lg" asChild> + <Link href="/partners?callbackUrl=/vendor/responses"> + <LogIn className="mr-2 h-4 w-4" /> + 로그인하기 + </Link> + </Button> + </div> + </div> + </Shell> + ); + } + + // 벤더 ID 확인 + const vendorId = session.user.companyId ? String(session.user.companyId) : "0"; + + // 벤더 권한 확인 + if (session.user.domain !== "partners") { + return ( + <Shell className="gap-6"> + <div className="flex items-center justify-between"> + <div> + <h2 className="text-2xl font-bold tracking-tight"> + 접근 권한 없음 + </h2> + </div> + </div> + <div className="flex flex-col items-center justify-center py-12 text-center"> + <div className="rounded-lg border border-dashed p-10 shadow-sm"> + <h3 className="mb-2 text-xl font-semibold">벤더 계정이 필요합니다</h3> + <p className="mb-6 text-muted-foreground"> + 벤더 계정으로 로그인해주세요. + </p> + </div> + </div> + </Shell> + ); + } + + // 데이터 가져오기 + const responsesPromise = getVendorRfqResponses({ + ...search, + filters: validFilters + }, vendorId); + + // 상태별 개수 및 진행률 가져오기 + const [statusCounts, progress] = await Promise.all([ + getVendorResponseStatusCounts(vendorId), + getVendorResponseProgress(vendorId) + ]); + + // 프로미스 배열 + const promises = Promise.all([responsesPromise]); + + return ( + <Shell className="gap-6"> + <div className="flex justify-between items-center"> + <div> + <h2 className="text-2xl font-bold tracking-tight">RFQ 응답 관리</h2> + <p className="text-muted-foreground"> + RFQ 첨부파일 응답 현황을 확인하고 관리합니다. + </p> + </div> + </div> + + {/* 상태별 통계 카드 */} + <div className="grid gap-4 md:grid-cols-2 lg:grid-cols-5"> + <Card> + <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2"> + <CardTitle className="text-sm font-medium">전체 요청</CardTitle> + <FileX className="h-4 w-4 text-muted-foreground" /> + </CardHeader> + <CardContent> + <div className="text-2xl font-bold">{progress.totalRequests}건</div> + <p className="text-xs text-muted-foreground"> + 총 응답 요청 수 + </p> + </CardContent> + </Card> + + <Card> + <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2"> + <CardTitle className="text-sm font-medium">미응답</CardTitle> + <Clock className="h-4 w-4 text-orange-600" /> + </CardHeader> + <CardContent> + <div className="text-2xl font-bold text-orange-600"> + {statusCounts.NOT_RESPONDED || 0}건 + </div> + <p className="text-xs text-muted-foreground"> + 응답 대기 중 + </p> + </CardContent> + </Card> + + <Card> + <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2"> + <CardTitle className="text-sm font-medium">응답완료</CardTitle> + <CheckCircle className="h-4 w-4 text-green-600" /> + </CardHeader> + <CardContent> + <div className="text-2xl font-bold text-green-600"> + {statusCounts.RESPONDED || 0}건 + </div> + <p className="text-xs text-muted-foreground"> + 응답률: {progress.responseRate}% + </p> + </CardContent> + </Card> + + <Card> + <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2"> + <CardTitle className="text-sm font-medium">수정요청</CardTitle> + <AlertTriangle className="h-4 w-4 text-yellow-600" /> + </CardHeader> + <CardContent> + <div className="text-2xl font-bold text-yellow-600"> + {statusCounts.REVISION_REQUESTED || 0}건 + </div> + <p className="text-xs text-muted-foreground"> + 재검토 필요 + </p> + </CardContent> + </Card> + + <Card> + <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2"> + <CardTitle className="text-sm font-medium">포기</CardTitle> + <FileX className="h-4 w-4 text-gray-600" /> + </CardHeader> + <CardContent> + <div className="text-2xl font-bold text-gray-600"> + {statusCounts.WAIVED || 0}건 + </div> + <p className="text-xs text-muted-foreground"> + 완료율: {progress.completionRate}% + </p> + </CardContent> + </Card> + </div> + + <React.Suspense + fallback={ + <DataTableSkeleton + columnCount={8} + searchableColumnCount={2} + filterableColumnCount={3} + cellWidths={["10rem", "12rem", "8rem", "10rem", "10rem", "8rem", "10rem", "8rem"]} + /> + } + > + <VendorResponsesTable promises={promises} /> + </React.Suspense> + </Shell> + ); +}
\ No newline at end of file diff --git a/app/[lng]/partners/(partners)/rfq-all/[id]/page.tsx b/app/[lng]/partners/(partners)/rfq-ship/[id]/page.tsx index 772a9840..772a9840 100644 --- a/app/[lng]/partners/(partners)/rfq-all/[id]/page.tsx +++ b/app/[lng]/partners/(partners)/rfq-ship/[id]/page.tsx diff --git a/app/[lng]/partners/(partners)/rfq-all/page.tsx b/app/[lng]/partners/(partners)/rfq-ship/page.tsx index e7dccb02..e7dccb02 100644 --- a/app/[lng]/partners/(partners)/rfq-all/page.tsx +++ b/app/[lng]/partners/(partners)/rfq-ship/page.tsx |
